Repository navigation
V16-UPD-CANCEL-a3: keep the maintenance-entry error on a poisoned slot mutex - #834
Merged
Merged
Conversation
When finish_unstarted fails after a failed enter, combine both errors instead of dropping the original maintenance-entry failure via ?. Test-First: src-tauri/src/update_cancel.rs::poisoned_slot_keeps_maintenance_entry_error Co-authored-by: Cursor <cursoragent@cursor.com>
Contributor
Merge Protections🟢 All 2 merge protections satisfied — ready to merge. Show 2 satisfied protections🟢 Paket-PR bringt seinen Bericht mitPackage branches (w<N>-, df<N>, ki-<N>, hq2-, dr-, z<N>-) must carry their report in the PR body, in a section that starts with "## Report".
🟢 🚦 Auto-queueWhen all merge protections are satisfied and these conditions match, this pull request will be queued automatically.
|
Cuarroc
marked this pull request as ready for review
October 9, 2026 09:47
Cuarroc
added
the
review-ok
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
34 of 50 tasks
Contributor
Merge Queue Status
This pull request spent 15 minutes 4 seconds in the queue, including 14 minutes 47 seconds running CI. Required conditions to merge
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Wenn der Wartungs-Einstieg scheitert und zugleich der Update-Slot-Mutex vergiftet ist, geht der ursprüngliche Fehler nicht mehr verloren. Stattdessen sieht man beide Meldungen in einem kombinierten Text. Drop signalisiert bei vergiftetem Mutex weiterhin wie bisher.
Report
Model: Cursor auto
Package: V16-UPD-CANCEL-a3 (follow-up of #830 / GLM G2)
Tier: A (concurrency primitive)
Head: 58236c3
Base: origin/main @ 55c2238
What changed
enter_or_abort: on enter failure, iffinish_unstartedalso fails (poisoned slot mutex), return"{enter error} (releasing the update slot also failed: {lock error})"instead of dropping the enter error via?.finish_flight's"leaving maintenance also failed".releasedonly after lock ok).poisoned_slot_keeps_maintenance_entry_errorpoisons the slot mutex viacatch_unwindwhile holding the guard, then asserts both error texts are present.Evidence
cargo test --manifest-path src-tauri/Cargo.toml update_cancelenter_or_abort)bash scripts/ci/red-first.sh --planbash scripts/ci/red-first.shbash scripts/ci/gates.sh lane prepushgit push -u origin HEADgit ls-remote origin refs/heads/cursor/w5-v16-upd-cancel-a358236c3d9aed3701f8ad8f214ef489b92f707de0Trailer:
Test-First: src-tauri/src/update_cancel.rs::poisoned_slot_keeps_maintenance_entry_errorNICHT ABGEDECKT
#[cfg(windows)]tests (run_in_pty, npm_shim, ConPTY, DPAPI) and Windows clippy arms — Linux lane only; Windows verdict comes from the merge queue.Review
reviews pending Root dispatch: Kimi K3 + GLM 5.2
Architecture drift
No new findings; no allowlist change.
Open points
None for this package. Reviews not started by this worker.
Made with Cursor
Root-Abnahme (head 58236c3, 2026-10-09)
Tier A (concurrency primitive,
src-tauri/src/update_cancel.rsonly, +27/-2, no seam). Author Cursor auto (family not exposed) → three reviewer families.enter_or_abortoutdated)review-pr834-anthropic-58236c3d9aed.mdpanicprofile override in src-tauri/Cargo.toml; under abort the branch is unreachable and harmlessenter_or_abortdoc comment (update_cancel.rs:89) — "release is attempted; if it fails both errors are returned and Drop signals the fixed restart error"red-first.sh --plan(exit 0)NICHT ABGEDECKT (Root): Windows lane only in the merge queue; no runtime test of the main.rs caller with a real poisoned mutex.